merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 26 Nov 2010 07:52:56 +0000 (16:52 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 26 Nov 2010 07:52:56 +0000 (16:52 +0900)

Trivial merge